commit 0c99970a28e8702164d721f718aab95a0f23e1b4
author Junio C Hamano <junio@hera.kernel.org> Mon Dec 03 09:57:55 2007
committer Junio C Hamano <junio@hera.kernel.org> Mon Dec 03 09:57:55 2007
tree 56df521f32bb95d2f9d4f940f2ff20815b1bd9e2
parent 0a16b951976d8a06e3f3ba341c2c2eef7541a65e

Autogenerated HTML docs for v1.5.3.7-994-g36863 

git-config.html

diff --git a/git-config.html b/git-config.html index 853dcb9..14615e1 100644 --- a/git-config.html +++ b/git-config.html @@ -283,7 +283,8 @@  <em>git-config</em> [&lt;file-option&gt;] --unset-all name [value_regex]   <em>git-config</em> [&lt;file-option&gt;] --rename-section old_name new_name   <em>git-config</em> [&lt;file-option&gt;] --remove-section name  -<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list</div></div>  +<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list  +<em>git-config</em> [&lt;file-option&gt;] --get-color name [default]</div></div>   </div>   <h2>DESCRIPTION</h2>   <div class="sectionbody">  @@ -498,6 +499,17 @@  contain line breaks.   </p>   </dd>  +<dt>  +--get-color name default  +</dt>  +<dd>  +<p>  + Find the color configured for <tt>name</tt> (e.g. <tt>color.diff.new</tt>) and  + output it as the ANSI color escape sequence to the standard  + output. The optional <tt>default</tt> parameter is used instead, if  + there is no color configured for <tt>name</tt>.  +</p>  +</dd>   </dl>   </div>   <h2><a id="FILES"></a>FILES</h2>  @@ -669,6 +681,15 @@  <div class="content">   <pre><tt>% git config core.gitproxy '"proxy-command" for example.com'</tt></pre>   </div></div>  +<p>An example to use customized color from the configuration in your  +script:</p>  +<div class="listingblock">  +<div class="content">  +<pre><tt>#!/bin/sh  +WS=$(git config --get-color color.diff.whitespace "blue reverse")  +RESET=$(git config --get-color "" "reset")  +echo "${WS}your whitespace color or blue reverse${RESET}"</tt></pre>  +</div></div>   </div>   <h2>CONFIGURATION FILE</h2>   <div class="sectionbody">  @@ -1130,6 +1151,18 @@  </p>   </dd>   <dt>  +branch.&lt;name&gt;.rebase  +</dt>  +<dd>  +<p>  + When true, rebase the branch &lt;name&gt; on top of the fetched branch,  + instead of merging the default branch from the default remote.  + <strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use  + it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>  + for details).  +</p>  +</dd>  +<dt>   clean.requireForce   </dt>   <dd>  @@ -1971,7 +2004,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 21-Nov-2007 08:54:16 UTC  +Last updated 03-Dec-2007 09:57:28 UTC   </div>   </div>   </body>